State2 -> Attempt to catch a mapping bug.  Uncomplicating some code so map overrides are straightforward.  Added logging.