move some code - only the from end needs the tables indexed by name these days