TECH DEBT

cleaning up units and soon to begin adding in better coverage
and more thorough test