Feature/swift back/betty/folsom