More changes and additions.
More Swift Migration.