Started to add button functionality