Punting on this since it's not a very much used feature and really not that crucial.