Started adding stuff
Started improved error handling