lots of adjustments to get database pulls correct
so many things
Merge pull request #40 from GJST-Capstone/stacy

Stacy