Revert "getting it to compile"

This reverts commit 207149e11712a30d922d8ad37232fc60566dba5b.
Revert "working towards getting it to compile"

This reverts commit 5d8550a59e5ad3990c2c3f6507efbc351d4145f4.
Revert "refactored"

This reverts commit 4b85bb14be218c5d73013e9a80dc397e9315af52.