Pull request for midterm (which is in jim_midterm)