Bens stuff
Merge branch 'dev' of github.com:obayesshelton/AYA into dev