I think the first version is OK, though much remains to be done.