Z factor

This depends on #50 and FC v2