Merged list stuff, list working nicely now