Class structure and what methods each class has makes a lot more sense
now. There will likely be a lot more infrastructure adjustments soon.