Added a lot of cool stuff