First pass of testing, a few hooks needed to be renamed and the Drupal behavoirs javascript code needed to be updated.