Add a couple of TODOs