Added a bunch of stuff for structuring