Wip overall rework
Wip soldier bundle
Wip overall rework