Alex Waring

For those monitoring this PR, I've split it out into a new one that is very similar but without the muddled history and conflicts.