first pass of Cloud Foundry prep