Initial changes as per Rosemary's request. Need to integrate into PDF generation, and add extra DB field