Intermediate - to sync with Filip
half of connect implemented
Merged