@nathansenn: Very close this