merging old doc into userstories