basic master-details
Better parsing
Parse stack