Now has tests to show it actually works