Attempt at splitting out and cleaning up the custom multi inputs commit.