finally working.  Cleanup time.