initial commit, post iteration 2