initial commit of extensive changes for integration meeting