removed entire stucture because of shit naming conventions starting over with right names