Changed names and working

yet to add the functionality of recieving