Added game logic, changed design