Commit some progress on phase 5.