Move common code to KitchenSink