Can now enter battles and perform actions
Bit to cleaning up.
Merging dev-combat into dev-ui