Maybe another name for this class? It made me think that there should be tests in there...