First commit of working code for acceptance