Working on #4 and improving error handling in general
Rename