Add Configuration Code
Update PortBuilder

Still have more work to do here.