Refactored for global ParameterStore, take 1, some FIXME and comments until things can be compiled