vectors added, still buggy.