OK, solved as part of #54 (moving most functions to use string instead of int)