Wip overall rework
User bundle done