Move rudiment out to its own class