Builder: Add comments
Lookup: Initial commit