After models
Add files and factory
Fix models and fixes that