added db features
merged in conflicts from laptop