Added a couple TODOs