Adding a couple of TODOs.