Devel to master

Drupal functionality complete. Screen captures added as well.