First attempt to add an x-factor.
Merge branch 'master-xfactor' into debugging-xfactor