#105 1st implementation. further work needed