More work to calabash-ios