Added comments and refactored a lot of code. Kept all the existing stuff just renamed it
Fixing merging