Adding a ton of stuff.   NOT CLEAN.  LOTS TO DO.