(works something like the POP code, should be fixed to work like we originally planned) svn path=/trunk/; revision=3540