More stuff on #6. Components should work completely now.