Beginning implementation of the history function
Merge branch 'master' of https://github.com/EpicWolverine/ATM