Added new features. Gotta fix something.