Midterm submission

I added this from a separate repository so you won't see all of my previous commits. See README.md for numbers you can use for testing.