Need to work on macs more, add address ranges