Still untested but now compiling... necessary for teamwork. Do not pull unless working with subscription database infastructure change