added most of pilot proposals
renaming/organizing