Mac

I merged it all, but apparently the branch still needs a pull? I has no idea what's going on here. But I'm sending this off anyway.