Began filling out analysis section.
Fixed merge conflict.