Yes but this was just shuffling preexisting code around so I didn't change anything like this.  I want to use #532 and really change it up a lot once the breakage is fixed