Major Changes to how everything functions

making everything work better :D