Scrapped old code.  New code finished.