Added new features, I'll have to give lists a try