Problem 1 final commit (tested)