Working on animation, searching for bugs, WIP commit