Comment out error-causing wait
Initial commit