Bunch of things
THINGS ARE WORKING
changed some things