Work on Shippable build