Well, I would (should) change the database class and router to be DI, but as for the other (few) singletons, they aren't used that much and are only sprinkled i

Well, I would (should) change the database class and router to be DI, but as for the other (few) singletons, they aren't used that much and are only sprinkled in places. I prefer the cleaner look with lazy-loading, just my opinion...