Merge branch 'Eric-Dev-Branch'

Attempting to merge my changes into Master. May the github gods smile
kindly upon my attempts. Amen.