Feature/add shippable