not done yet, but starting to incorporate changes discussed today