OOP framework done, needs plot fixing