Revert "major clean up, simplification"

This reverts commit ab5b0cd81e22152ba5de40c13a6af23cde660503.

screwed up my username.....