Implemented more game features - have not tested yet