First Pass with unit tests
Removed Temp files