Working mux
More mux handling
Added back in home