MAJOR COMMIT SEE DESCRIPTION

I know I'm not much of a description or commit title maker but I thought
that this one should be made.  I had tried to clean up some code but
that had failed for the most part as it screwed up my logic.  I went
back to the master where I knew the application worked previously and
had to fix multiple conflict issues to ensure that it did work properly