initial commit and adds from steph