seems reasonable, though I feel like we'll have to come back to this again before long. will rebase and push manually
Pull-Request has been closed by mikem