Started adding buttons and timer