Merge initial swift work from neillc's fork.

brace on newline please :)