Fixed date insertions, merged and removed unused modules, made a neat search wrapper, all peachy!