Fix up most of the cat moving issues

The end condition still needs some work