Things are working, but not clean.  starting the clean now...