kludgy eval/wait parsing + test