Fix tests
Add TODO section
Remove dead code
Remove dead code
Start to implement better error handling
More error handling