added TODOs from mtg w/ Jason, Kanak