Adding some structure.

I'll start working on this throughout school today.