Updated Midterm, almost complete