You don't have to merge this pull, I made it so that I can comment on the differences.

Needed these in order to not have to refactor all the imports in the project.