Added a ton of features