Added beginnings of actionFactory