Working on filtering/searching and cleaning up.