Now compilable #yay ... bit still untested and unfinished