Added a bunch of cool stuff