Initial commit before adding cloudfoundry specifics