first commit, most work done