Some more OO stuff - looks good