Database current as of now
Merged with Chris
Some of my work before pulling in Chris's stuff