re-work conducted during first actual use.  Added params, and code cleanup