Good foundation for complicated puzzles. Big improvement would be cats continuing to move to their targets when you select a different cat.
I agree. The code for that feature is a horrible mess and needs to he completely rewritten.
The curse of eternal refactoring!