First commit of working version