derp, that is still hardcoded...  along with the PSTAMP later...