Attempted to fix error, couldnt find.  Now rebasing and rewriting..