WIP added schema validation to schema