Updated obs form to use templates w/ params. Clean up.