Final commit to 'master' branch.  Code is now (mostly) functional and
everything has beautiful comments