Feature/cuttlefish packaging