First commit of work finished so far