Some restructuring. Obviously tinkering with how I want this to work.