And I'm an idiot.  Removing the duplciate code