Quiver Redux

Quiver as it was intended