Starting work on updating how lookups happen
merges added