Should this be exported like this? Might be better as a separate module, otherwise it's cluttering this module a bit. Not a big deal, though