I think a bus-multiplexer is a good idea to add.
Its very useful if you have to multiplex a large number of signals.
Normally u have to use 16 independent multiplexers and a lots of wire.

I'm not really adding any more gates at the moment if they can be implemented using fabrication. You will be able to make such a circuit yourself.