Modify model to reflect intro/extro, instead, and add headers to remapped output.