Now runs. Factory not working exactly as we want though