Copy tweak, removing extra button
Add todo, run tests, merge with master