Forgot to include these in last commit. syntax overhaul