Change declarative to function

database creation function now works.
Merge

Merge folder change