Preliminary Working Version

This version of the multi-epoch Factor seems to work (at least under certain conditions), but it is based on an old version of the master branch.