adding a couple more TODOs