Did some oop stuff