Attempting to get the glow trios working, incomplete
Fixed merge conflict