Added a butt-ton of features