fixxed shit and put it all in one file