Initial merge. Cloned from https://github.com/misssfit/DistributedMcdaRepo and extended up to this point