Refactor the measurements and claculations. Now using a minor/major slot model.