WIP

Moved more functionality to DBHandler.