Started f3
Finished feature 3. Gonna rebase.
Merge branch 'dev' of https://github.com/TheThinkTank/ARepo into dev