More written on problem
Problem done
Merge branch 'feature/problem_part' into develop