Complete Redesign

Working on Validator