GameObject implemented
Merging from last commit