Started refactoring data to more OOP-style.