initial commit of working version