Added Shit Load of Stuff

Have not tested yet !!!