Work in progress on new input style 2