Singletons very much broken, but added on change stuff to collection + mapping