merging what i worked on today and what i worked on last night.
Basic functionality of the results list is in place. Now I need to be able to add all the right data.
Dealing with some forgotten conflicts.