inital commit
merge fixx