Beginning domButton refactor, upshpillar