initial commit, continued