Comments on prototypes.  Added wait/signal() additional code from specs.

Commented out any new code added.