feature commit

this is a super awesome feature. Please MRGEEEEEE