Added more features. This isn't the greatest commit message