Start adding groundwork for #5, support Map/List building