Object encapsulation throughout game is now fixed