discussed with Wojciech Trocki and will do a release for these features. squashed commits on feature branch