Fixing structure

It's based off of what we learned in class today