added API/game logic
merge jon
resolved conflict