everything's done but the 2 generation funcs
Authored by: hellcatv 2002-02-05
Parent: [r1680]
Child: [r1682]