got it working for 70%. 
merged it to master branch