Combined and Cleaned

Most of what I did was take Clay’s stuff and my stuff and combined the
two sets of classes together.

I also made some formatting changes for consistency and changed a few
variable names for clarity.

I also changed the to-do.