initial commit, working state for milestone 1