some cool new features on different branch

Oh it's gonna be a cool pull request.