GPII-228: Temporary save while doing other work
GPII-228: Things are working now. Requires cleanup and tests