Half way through modifying all of the binders to be factories