Attempting to push Sami's Database Code to the project

Not yet tested.