Fix working camel binder - need to do a lot of refactoring