AlmostDone

4:51 Kevin look at it
Lib
Merge pull request #1 from Kevinljh/michael

Michael almost done