WIP
- Removed some old code (SHIRO security)
- Added user/account/role handling