Animation overhaul 1/2 - needs implementation