More progress to database rewiring? (Still borked)