ebaby Story 8 - refactory to use a Factory