Added some conversion functions in GameState, starting to use them