Yea, I'll be making that commit once I get the "push button" stuff done.