Wip overall rework
Updated assets
Wip building bundle (not functionnal atm)