Itsafeature

Using a pull request for my fancy new feature