Lists and JSON

A couple of things that will make this nicer to use.