Merge in secant work

This pulls in everything that's happened after the 2nd hackfest