Also check for priority and name. And while we're at it, redo the way we create expevted{}