finished added all private/public defs...second time