Whole solution

After class review