Starting to add port specification.  Total hack, but will be cleaned up later.