Refactor to use Cuttlefish