Issue #6 - More DatabaseCreation work