Finish the rest of the cat movement

Should handle all of the possible moves while keeping the Cat object
intact