Started work on the new rule engine and also started fleshing out the validation for queries