[WIP] Adding functionality to new buttons