Moving into singletons to simplify codebase

Not ideal