Got experimental version working (I think)