Class is now actually using the button names