Just started refactoring
