Enough work  for a friday afternoon.  Models generated, extending nothing at the moment, will sort out over the wekeend