Massive changes

lol