Added some TODO notes so I don't forget