WIP contributor architecture