Edited Lookups in preparation for Activities change. Tests run.