Midterm Pull Request

Sorry for handing this in so late!