Feature/now 574

what happens if multiple tokens are returned? also we should include the companyGuid in the where clause