added to github - still work in progress
merge