Clean-up and began work on lists