Got animation working correctly

Totally re-built the structure of the app to do it, but totally worth it.