Also, good call on onListener.  Will add that today.