Cleaning this up
Store added, input multiplexer extracted.