AlmostFinalVersion

Comitted before getting out from home