Extendfeatures

Woops was trying to merge this into my own fork, didn't mean to create a pull request for your repo