Improvebot

I'm going to rebuild magpie into something much better: waxwings!