removed singletons, added main container