most of the reworked logic is in place, now needs testing