Initial Commit of OOP Working Copy