Revert "rewind again"

This reverts commit 8c79736774bd0c900a66e06b5f5360e888b14e5b.
Revert "starting to update to use Vectors"

This reverts commit 89f9411d5f58b6e51797e12e1e426401a0fda872.