Should this be in a subpackage or is that still causing test errors?