I'm just worried about the size of this class. It was already too big before :(. If you were adapting or replacing existing featuresi it'd make sense to leave it here.