Added methods and worked on structure