initial commit
Add more efficient lookups per #1