Re organizing the oop code

So only have to find oop n1, n2 etc info one time