Midterm finished

Final commit for finished midterm
Close. We'll go over this on Monday.