Manually pulled in Observation functionality

Manually pulled in content from new_aaoc branch. Updates location
reference to template files.