Patrick + Brandon Branch Merge

Merge between branches