wip restructure dynamic component adding.