[WIP] Refactor pre-qualification classes to be less verbose