A lot of refactoring, so committing. Not finished, but making progress on the medications form.