Xcode6/Swift conversion test.
Move around stuff.