new stuff
incomplete
Working version without the people who were causing problems
middle step
resolved conflicts, working file