Attempted Merge

Here is my attempted merge of our projects.