First attempt at allowing port/host overrides