Make completely oop