Working on pushbutton integration