Portability

Pulling this in, so I can edit it.