More work on the shipping selector functionality.