Change parts of game.cpp to use iterators