Basic search done, one report, and organized more code