second try at this after cocoapods destroyed me