Added external buttons, trying to figure out how to keep track of them