[WIP] @orta => Fixes #6

This still requires tests, obviously. And it needs to actually, you know, work.