New awesome feature

Merge this please! @bodnerdan