Finishing up, still need to convert the hierarchical list selector