Jake's feature

Andy, please review my new awesome feature.