Merge initial swift work from neillc's fork.

out of date comment