wip
refactoring character factory
Merge branch 'feature/factoryFix' into develop