Slightly refactor the component kick start

I just realized you should be able to put all this in a loop, so I did