some working stuff ...
Add comments