First pass at using new sprout-wrap