Fill in some of the TODOs.