Changed to gamestate pointers in Gamestate files