Intermediate checkin, troubleshooting data issues

Intermediate checkin, troubleshooting data issues. Need to determine
whether we need both Web API and MVC, and also whether we can update to
MVC5.