Updated with a lot of animated & a few other bits.