Initial separation from Createsite script