This is the file Dayton and I worked on to simplify and unite the user stories.