Start switching over to Components. Broke at least a couple of pieces that were at least hypothetically working