Currently functioning - good save point before working on transfering to using objects and higher level functions.
Merge pull request #16 from meltcaleb/master

Currently functioning - good save point before working on transfering to...