Refactored combat code. Added GUI.