Added a few todo notes so I don't forget what I need to do