More refactoring and clean up.  Reduced many methods down to a few lines.