Lotsa DB changes. Combini adjustments based on user interface