Structural Update.

Will work off master branch until I put it in production