database creation handled on startup
delete comments
Merge branch 'database'