Started to add class to hold data