Made dynamic components work

I hope