Add some TODOs
Thanks to Stanimir Simeonoff for reviewing code and suggesting it.