Wip overall rework
Fight bundle wip