Re-adding Martijn's start of exp eval