wip: Untested feat

I'm an asshole dev that does not test his commits.