Hah! It actually works. Must have left it mid-refactor, but patching up now