big commit further consolidating markup