Added provisions for Static usage
Refactored to separate Drupal out in preparation for updating AWS DB