MOB-1530

**DO NOT MERGE YET**
could we declare this object above and just reference it here to have a clear public API