first-pass claim parser
changes from 'git pull origin develop'