untested initial commit of first updates