Added an override to grocery errand, updated factory to work for all types