Syntax check needs more work...