Refactoring singletons
Render order implemented