Swift changes

This should be in a template, not in the controller.