Some refactoring
Adding some changes
Fixing the last fucking bug