alpha 0.6

first implementation ( not working )