Feature/sprint3