added more structure, list sorts now too