Implement new feature

* This is really important please have a look and tell me what you think

@bkeepers