Bug 933046 - Initial factories (no onbuild magic yet)