Changed to gamestate pointers in Main.cpp