Refactors quiver management
Merge pull request #4 from ramdog/refactor-into-services

Refactors quiver management

[Finishes #19730492235179 #19184364948481]