inital commit
some edits