Develop

Last changes, basic refactoring.