Added proper mapping and error handler
Remove swap files... add fail