start to merge in swift-lite stuff