Improveddatabase

Ignore for now, merging into ui-update instead.