added image and some error handling, added some TODOs