Some further work (not finished)