Restored Original StockWatcher.

You guys should edit this stuff in a text editor rather than Eclipse. We're just making merges, not actually trying to run the thing.