Work in progress. Stub for new button. And fix selection