WIP: it assembles cleanly