Fixed Query
Function works
Added Return view, work still needs to be done