Working draft of a more modular architecture