So many changes!  I think I got it all to work