first commit of working version