Making the first try
Some tweeks, first test works