Pull request for button thing

I think this is another pull request maybe.