Better handling of animations
Square rendering finally contains some proper code