Completed up to 4.3.1.1 (well almost, need to display all patients if obs_type is 'General')