Go through a couple of TODOs