Did some work on searching, changed object presentation to specialise on each row...