Trying to update my fork

If this ends up as a pull request on the actual original file, I did something wrong and you should ignore this as it will be horribly out of date.