Class Structure Updated

check it out and let me know what needs changed