All of the changes that Cole brought over.
Merge branch 'Testing'