Redo the owners properly as a new db entity, very naughty!