Improvebot

I'm going to rebuild custodian into something much better: goalkeeper!