Matched more requirements, implemented sections

Changed to incident search, building search. Laid more groundwork.