Revert changes
Bunch of new submodules
Better mapping for bubling text