Typo--goals was using update variable.  Fixed naming to be consistent even though the tests were passing prior.
Added add_wait and tests.