Could move a base class for references into types.
I think we need to clean up where the classes live in general. It has gotten quite messy.