first commit, pt.2