V1.0

Mostly working all cases