stuff
still not working oh well
merging