Starting merge of components
Stoped at flow_controller
NOT TESTED YET