First Commit
Removed unnecessary TODOs
Better error handling and messages