initial commit, partially complete