TOC by Grape refactoring complete.  Intermediate checkin to test on iphone.