Lots of fixes.  Inital Testing Submit