Q3 working
Problem 3 full
Merge branch 'P3_working'