cleaned up code and start to include Alpert.  Alpert not done yet