Much more progress, simplified configs and nearly working Docker build.