We should probably cleanup these lookups at some point in the future and centralize where it's being done at some point in the future.  Opened up #61.