Started adding lookup