Brandon: Merging Shannon's code
Brandon: Preparing to merge.