First test: viewing the distribution. Some refactoring.