Voting is complete for comments!  Need to clean up some stuff; DRY the c...

...ode with refactoring.