Start pulling validators/extractors into classes