Moving a chunk of functionality into Stringray::Includes