Almost finished refactoring
Made refactoring
Made refactoring
Merge branch 'Refactoring_refactoring' into develop
Added lot of environment things, fixed merge conflicts
Somehow fixed bug
Now it fixed for real
Fixed merge conflict
Fixed merge conflict
Fixed registration
Final little things
Merge branch 'develop'