Started complete refactoring