Fixed basic structure, didn't come out correct last commit