Adds a couple of more TODOs