Built logic for complete game - some bugs