further work, last before splitting to new repo