Animation is now working properly, albeit a little on the hacky side
New commit