Hopefully BCNF now.
Patient addition/removal working bug-less-ly