db structure changed locations added
merge with tommy2
resolve migration conflicts