Added important TODOs and going to sleep