Middle of major rework for v2 of dbwebb