Starting to impleent Mason's suggestions
Fixing merge conflicts from a pull