Revert "Failed rollback!"

This reverts commit 0a795caad885d9a1023277d28a65f36030232468.
Revert "Revert "Added quiver fixed some stuff""

This reverts commit 28b4589e6fe75a2dd2dd2723b16117477d7ec02e.