added database and some methods
conflicts
.