3rd Commit FINAL

Final game with all the changes