Rework animations PART 1. Still need to do animation removal.