did stuff! changed some names and stuff