Further extraction
WIP
WIP
Fix crash when no current_user is provided