Migrate warrior classes to factories and implement messaging