I'm not sure what to do here: should we comment on this PR, or wait until you've fixed the obvious problems?