Merge in secant work

Merges in all work from the 2nd Hackfest and beyond