- partial changes to loading with promises - does not load right now
- removed singleton pattern