TODOs and modifications re: review from @jmcphers