Just a couple TODOs