add a couple more TODOs