hopefully i fixed my structure issues?