Improve (?) things so that it vaguely feels like I'm actually using Components. This mostly just illustrates how bad my original implementation was