Adding a couple TODOs