Let me merge this PR and work on it. Then you can review that and we start from there.