Issues/192 experimental

@juphoff would you take a look? :)