Worked on populating the classes