Re-added early vector work. Should be redone.