Added systematics.  Cleanup and debugging still required.