Now actually works

This took far longer than it should have