Made it a little more componentized.