Working on merging logic and validators into a universal format.