Moved richard's additional TODOs to the top.