Adding Object Orientedness (Partial Edit)