TODOs resolved.