Fixed validator, start work on sql runner