Redid salary progressions, added some helpers. More to be done