preparing for 100% oop