third commit, some steps forward