Final submitted version for due date #2

There were some issues and some formatting concerns for the version we
intended to submit today. Luckily, we have resolved them and we met the
deadline.
There is a lot of work to be done.