first commit of working code