Commits squashed and amended to remove commented code by Adam Honse <calcprogrammer1@gmail.com>
Commits squashed and amended for code style by Adam Honse <calcprogrammer1@gmail.com