Finished the Factory Rolloff changes

One bug remains, see README