Shuffle things around to try moving to RubyMotion