Initial work to merge with rackspace