Core game mechanics working, getting ready for a refactor of state/config