b1, still not done.
more 2a.
Merge branch 'master' of https://github.com/estj92/WI-MiniProject3