Added Database

TODO: Test for any resulting bugs.
Error Handling.