WIP move ports construction to then block