Really looking good now....

Only the medication filtering to be included
(and maybe some double checks!!)