DrBigNik's super feature

Plz merge this.