First version seems to be working.