Convert storage over to use vector better.