Get rid of hard coded dimensions
Handle end of game