More refactoring to streamline OJ node creation
merge