adding more features to support lists and things