Trying to get working with 2.1 stable spree