Any progress on these TODOs?