WIP
covered spec tests in whitebox subscriber verification
Needs cleanup and squash now