Reorganised data so we can filter on it.
API rendering good.