Back to old animations and started to make things fully fluid, closes #23