This still has a lot of the nested list stuff from #8