50% done, now missing expression validation