Work in progress on ruby client refactoring