Refactoring of State object. Animation now functional. :D