commented out polling and trigger history, i can redo this better
new username and layer working