Adding the most recent changes for the db stuff including the start of a test. Just want to get everything up on GitHub...