First stab of expr for defines. Not yet in the build