Working on getting the sorting working.