Add first almost working version