More EF Tweaking

Sorted out the includes (uses 1 include).
Added a PatientViewModel