Add this.
Clean up.
And fill this in.
I think this is how I want this structure to work.