First commit
deirdre
added places
fixed conflicts