tristan's whiteboard design
edit section 4
merge