cool-feature added

Hey I just pushed this and this is crazy. Heres my pull request so review maybe?