Still kinda rough, but seems to work

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>