Add start of OO interface
Cleanup