move client serices into app
fix
work in progress
work in progress