Major cleanup of model code, add medications