Removed a bunch of stuff

And added in some cool stuff