More factoring.
WIP.