Modified some minor things
Lot of basic things added. Will be used as template