Moved to MultiCommon
Refactoring out the first two stages (Heuristic and Trial) into classes. In progress....