tom: more or less working, versions next