Messed around with the TODOs.