Milestone #2 complete

Here is the final solution!