Fa4

Hey Tom, this is a rebase of your #6084 with a few fixes. If you want to hard reset it and force push. 
Otherwise I can submit it myself.