Huge progress on Combat, GUI and persistence