merge, removing vector name
Initial attempts to make a new intersection code.  Lots of changes