Last commit for current verison, shifting to new branch for gameplay redesign