Set up some lists better