- Refactored a couple convenience methods, and started to set up the pick handlers