Started refactoring GNGDatabase, #20