Revert "Revert "singleton w Model, Map""

This reverts commit b60cbd745b97a5902bbbafd282663ca82e80ceca.