Started work on validator - switch to branch 'validator'