Initial commit of OO demo