many many changes, working on first revision of full document