Does this actually work? I wouldn't merge this until you have some tests to prove it!