Buttons are being added. First Merge attempt