First working version for our hybrid solution