Started feature 7
Finished feature 7
Merge branch 'dev' of https://github.com/TheThinkTank/ARepo into dev