a couple TODOs