Tried to move attack-defend-expand code into state machine, not tested
Fixed a bug with the timer