Master wip/proceedings