Added lots of cool stuff