Initial coomit
few changes