Swift changes

This should be in the template, not the controller.