Closer to having lists working well