Complete refactor, scene creation complete