reworked class logic, rattled the reaison d'etre, and refactored all tests