WIP: towards a more modular chain