Fix singletons to be declared with 'new', initial work for rendering skeleton.