Feature/third commit

Third branch