Pulling changes to Adam branch

To continue working where I should be.