formula-based work

Ignore d2528c6d0fd23061108979ce13598acddf213157; I couldn't find a way to remove it from the request.
As noted, would work better as a branch, but at least this way you can see what I did.
Ross