Continuing to refactor

Good progress.  Working through individual sections now to make sure
each functions.