Coverted to new structure - still needs status sorting.