Going to do game modes a bit differently I think, as the sort of building block system I have now is getting a bit unwieldy. Committing some more work I have so far. Also merge from Main.