Midterm finished

Final commit for finished midterm