Prog development

Development is finished so It can be added to the master branch