Merge pull request #1 from ams-bjones/master

update from ams-bjones
updated databases unit
database unit working on
working on databases
Merge pull request #4 from grimley517/master

databases unit - partially complete