Started working on the search functionality. Think that the initial functionality has been completed.
Fixed a quick bug with the code.
Also got it fixed so it doesn't spit out the results multiple times.
Updated the TODO accordingly.