More animation code done

Not quite finished yet