The things that I'll add
Revert "The things that I'll add"

This reverts commit 6bd7f8ef18f018fea663b0c568ef31af32fd076e.
Revert "Revert "The things that I'll add""

This reverts commit bfb1a2638f8c97ca27b6597631735cab4a0c3370.
Merge pull request #20 from Nahoj814/Johan's-Branch

Johan's branch