further work on orga client