More refactoring.  Changing most linked lists to stl vector