move TODOs out of source, add lots of other TODOs