WIP -- all good except code and animations