Added factory section and started mocks and stubs