Animations done, rendering fixed, logic next