Commit only the refactor sections to match new specs.  Code check in later in week