Game logic expanded, almost done