Not sure what direction to go with this, but it's better than being completely in the base module, for now