Added user wait. Need to fix evals at bottom of files