intitial version with demo add-in