Wishing I had a local copy to try this on so there wouldn't be so many commits :-/