T:7 and GameObject refactoring