Added a ton of new features