@brettweavnet if it's good, i can push up my changes