Create Database Lookup feature
Merge branch 'feature/Database_Lookup' into develop