Merge lookup command into master

All the tests for the lookup command currently pass