Mob 1834

I think we're going to leave it as it is for now. From one point of view it's inconsistent from another it's consistent with database. We could come back to it while cleaning up after ComiCon release.