Added Database. WIP