Import of work done

Committing whatever done so far