Singletons pretty much working apart from some weird failing unit test... will fix that tmoz instead