I gang

Second phase of drupal development work