More tweaking.
Initial work on lists.