Devel 

merging but work is in progress, dividing #79 to smaller issues