Changes using KitchenSink as the basis for the build