made master branch stable by commenting out extra features which I will reimplement in experimental branch