Implemented basic lookup functionality, fixes #13, fixes #17