Revert "Rollback"

This reverts commit e231f91886830a2a9f1ade5941bbc93de64afd09.
Revert "added stuff from previous module. still not searching."

This reverts commit c51020d7ec971837e2623702aa604e91a32e9513.