add current user functionality
fix returns