Bug fixes, not working, fixing delegate
User list working
Merge branch 'next'