Finished work on feature 4. Gonna rebase this too.
Merge branch 'dev' of https://github.com/TheThinkTank/ARepo into f4