Adam

Merging my changes with my changes because GitHub is hard.