Started adding buttons for manual operation