A quick commit

Lot of changes....