Added some more structure
lol