Refactoring.
Refactoring.
Merge branch 'basic-encounter-info' of github.com:blackhydrogen/noop-webvisual into basic-encounter-info