Cleaned up Simple implementations
Prepping for test harnass