some things changed, further along with game logic