Added clinic scaffold.
Some minor changes.