Stage 3 adding state | factories