wip DB normalization