Some review, some TODOs.