Initial configuration is simpler. Closes #6