Final Commit

I had to hand the project in because the deadline was midnight. Here it
is as it stands.