Improvebot

I'm going to rebuild ornithologist into something much better: geriatrician!