beginning to implement a more efficient lookup.