Shipping changes

Work in progress for #97.