First version working ... mostly ;)