Buttons Update

Added some testing stuff