Doesn't really need to be in a package anymore, since it's only
one file