Fix passthrough delegate.
Add NSOrderedSetTableViewDataSource
Clean up