Started refactoring...