Looking back.
Added an animationHandler and some info at the server.
Merge Fail