Complete Re-Write of Cat
Updated gamestate